Skip to content

fixed time.h import, added Arduino UNO R4 minima (USB), Arduino UNO R4 WiFi (USB and WiFi), Arduino Giga R1 (USB and WiFi) (backport #1712)#1863

Merged
pablogs9 merged 3 commits into
rollingfrom
mergify/bp/rolling/pr-1712
Nov 15, 2024
Merged

fixed time.h import, added Arduino UNO R4 minima (USB), Arduino UNO R4 WiFi (USB and WiFi), Arduino Giga R1 (USB and WiFi) (backport #1712)#1863
pablogs9 merged 3 commits into
rollingfrom
mergify/bp/rolling/pr-1712

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Nov 14, 2024

By importing time.h instead of sys/time.h you can build micro-ros for Arduino UNO R4.

It addresses issue: #1461

This PR was tested on following targets:

  • mbed (Arduino GIGA R1)
  • m4 (Arduino UNO R4 Minima)
  • stm32 (STMicroelectronics Nucleo F401RE)

This is an automatic backport of pull request #1712 done by [Mergify](https://mergify.com).

…4 WiFi (USB and WiFi), Arduino Giga R1 (USB and WiFi) (#1712)

* fixes time.h import

* added support for Arduino GIGA R1 over WiFi

* examples with giga r1

* uint -> uint32_t, added uno r4 wifi

* added uno r4 into the example

* added uno r4 family into library properties

* led builtin check

* added boards into readme

* updated ci

* fix typo

* updated cli version

* force update index

* reverted cli

(cherry picked from commit e347a4a)

# Conflicts:
#	.github/workflows/ci.yml
#	README.md
#	examples/micro-ros_publisher_wifi/micro-ros_publisher_wifi.ino
#	examples/micro-ros_publisher_wifi_at/micro-ros_publisher_wifi_at.ino
#	src/micro_ros_arduino.h
#	src/wifi_transport.cpp
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Nov 14, 2024

Cherry-pick of e347a4a has failed:

On branch mergify/bp/rolling/pr-1712
Your branch is up to date with 'origin/rolling'.

You are currently cherry-picking commit e347a4a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   library.properties
	modified:   src/default_transport.cpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   README.md
	both modified:   examples/micro-ros_publisher_wifi/micro-ros_publisher_wifi.ino
	deleted by us:   examples/micro-ros_publisher_wifi_at/micro-ros_publisher_wifi_at.ino
	both modified:   src/micro_ros_arduino.h
	both modified:   src/wifi_transport.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@pablogs9 pablogs9 merged commit 886187f into rolling Nov 15, 2024
@pablogs9 pablogs9 deleted the mergify/bp/rolling/pr-1712 branch November 15, 2024 07:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants